From: Joakim Verona <joakim@verona.se>
Date: Mon, 19 Aug 2013 04:36:32 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c20b50ee18b5f9926d98fde1a4aa98ae78621d93;p=emacs.git

merge from trunk
---

c20b50ee18b5f9926d98fde1a4aa98ae78621d93